Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 22 Oct 2011 05:54:01 +0000 (22:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 22 Oct 2011 05:54:01 +0000 (22:54 -0700)

Trivial merge